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