Merge "Ensure Keyguard classes use display-aware context" into main