Merge "Keyguard padding fixes"