Keyguard : merge fix