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

Change-Id: I3469ba71e2191136b94325101bf340f825c4fd14