Merge "Moved activity to stopped state if relaunched while device is asleep"...
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev am: 36c4fc97
am: d026b446
Change-Id: Id7ca4b27fdc5a2cc6a0b9e40f6952fe504718353