Merge "Remove dead code from keyguard"