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

Change-Id: I00108fe1963cdd648fc89b89dc59f3086350dd88