Merge "Only remove task if activity fails to start." into oc-dev
am: 53bac3d927

Change-Id: Ibb614910e47ddc31fbf671ba83b5f148bfc74875