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

Change-Id: I9cb89d37dbce086ff1f00229132dd960524a1196