Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\\" into nyc-dev am: beaf3707fa
am: f929560813

Change-Id: Iab35cc9bcfffef209ef45707feb4498165a0507b