Merge "Fix problem with glyph cache and textScaleX property"