Merge "Fix work notification dismissed in work challenge screen" into nyc-dev