Merge "Fix cyclic keyguard state notification"