Merge "Re-evaluate scrim color on keyguard vis event"