Merge "Remove all activities that do not successfully launch." into oc-dev am: 1a08d200fb
am: 1f459d2f32

Change-Id: I2d8eef0575d3b8282eb46aff7a0f4afe73bfebf5