Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev am: 8af60e4c0e
am: 8dd7d067f7

Change-Id: Ib23207b08a56d4d1883b1b4dc33debe25c76d471