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

Change-Id: Id5bd84cbec504aadb89286b38ec0b602160b13b5