Merge "Set font sizes of typed passwords and pins  to match keyguard"