Merge "Scrim opacity varies based on notification count"