Merge "Fix QuickSettings header state on Keyguard."