Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev am: 36c4fc9779 am: d026b4460b
am: 4bb151c248

Change-Id: I41251975b945643e677f40fd03c6ec336bdfbf18