Merge \\\"Revert \\\"Don\\\'t re-launch activities while the device is...
Merge \\\"Revert \\\"Don\\\'t re-launch activities while the device is sleeping\\\"\\\" into nyc-dev am: beaf3707 am: f9295608
am: 4553be6e
Change-Id: I78c2143c1fed3736cb9bd8714b12dd829b4dcaeb