Merge "Remove all activities that do not successfully launch." into oc-dev