Merge "Only remove task if activity fails to start." into oc-dev