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

Change-Id: I61c6e1e694e9d9168f8398092dba53e4391d6f02