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

Change-Id: Ie6995527fb31b9b5f0c272726c80754927770c55