Merge "Fix problem where keyguard shows spontaneously"