Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev