Merge "Ensure destroy AsyncTask at main thread" into devel/master