Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev