Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev