Merge "Make sure onPostExecute() is never called after cancel() Bug #5651553"