Clean up duplicate code in Keyguard from merge
Revert missing resource identifier