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

Change-Id: I206939f60b4ff73736377b63e3f651be1bd2992a