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

Change-Id: I866ca87bafc9d2ed16160cff4d5b18f7d46768ba