Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am: 2058553b8d
am: f5cf319dc9

Change-Id: I65ee6db43e3ea7df99bac0edb81a034fc6318984