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

Change-Id: I14d57d688026d06bc4cad7c492f80a41b8e5bb85