Merge "TextLayoutCache - more code refactoring"