Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev