Merge \\\"Don\\\'t allow showing an activity if user is stopping or shutting...
Merge \\\"Don\\\'t allow showing an activity if user is stopping or shutting down.\\\" into nyc-dev am: 2058553b am: ea600f9a
am: 39c5f9f0
Change-Id: Ifd0df3a3e18f475347fee163ce002a18bca460ac