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