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

Change-Id: I813101979f48bc5af73add86af142169cec10679