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
Change-Id: I1b43aabc35b45558c90750cab7314b63ae8d4b60