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

Change-Id: I2245df4205a28af10fa08eee592176bc6a73ae8e