Merge "Keyguard slice layout fixes"