Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev