Merge "Fix some TextLayoutCache issues"