Keyguard: Fix Pin-Layout (squashed commits)