Merge "Fix TextLayoutCache Skia Typeface caching"