Merge "Fixes two bright flashes of the notification scrim" into sc-dev