Merge "TextLayoutCache code refactoring"