Merge "Remove problematic letter spacing from keyguard" into qt-dev
am: 75e8a9b8f4

Change-Id: I33ab5f777b41f32caf1f1d8322977880f1ad2687