Merge "Fix potential issue with the TextLayoutCache with glyphs"