Merge "Keyguard SIM PIN: Fix height" into sc-dev