Merge "Fixed an issue where the notification scrim could become transparent" into sc-dev