Merge "Don't re-launch activities while the device is sleeping" into nyc-dev