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

Change-Id: I1328274d5d331defc274ba010218274105d760e4