Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\"...
Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am: f159b746
am: 87ca3c1f
Change-Id: I14d57d688026d06bc4cad7c492f80a41b8e5bb85