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

Change-Id: I174e78c4f26f9b9fa77a91c04353c75a2197ebd4