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

Change-Id: I5f7cdfb398f74cd0c0ed172a001094e438190e6d