Merge "Fix bug when Keyguard gets hidden."