Merge "Revealing the light reveal scrim only during keyguard exit animation" into sc-v2-dev