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