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

Change-Id: I72d39e81ae786f18fb3991fb243837e802440311