Merge "Patches for IKeyguardStateCallback"