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

Change-Id: I338f8d2cf0124a36b61d01dfa79dee91128506ac