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