Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev