Merge "Use KeyguardControllerState to check for keyguard"