Merge "Remove problematic letter spacing from keyguard" into qt-dev