Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
am: 7188fda4af

Change-Id: If501b5b534bee5b95f446fd48012c4c6a779bb10