Merge "Use font padding for keyguard clock" into sc-dev