Merge "Don't let hidden keyguard interfere with button and screen brightness overrides"