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

Change-Id: Ia879bc9ddf0cb11764e0669aa05be93da89d6f2e