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

Change-Id: Id53132990bd479943815f431fa219541c8daeffa