Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev
am: 02584a23b3

Change-Id: I6210e77f2d4a2cea52f2a314b2d329b51f79c93a