Merge "TextLayoutCache - fix diacritics composition"