Merge "Fixed an issue where the notification clipping flickered" into sc-dev