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