Merge "Fix bug #5180841 TextLayoutCache needs to support Indic"