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

Change-Id: I8a1bc9b2f8142a2e60091aefb9f4ecc54955bdc3