Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev