Merge "TextLayoutCache Fix compilation issue"