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

Change-Id: I1995dee390d20f18d223addaa6232765dfded8a5