Merge "Code refactoring for TextLayoutCache"