Merge "Fade notifications with background scrim for shade expansion" into sc-dev