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