Merge "Adjust padding for keyguard pin entry keys" into klp-dev