Merge "Fix potential leak in TextLayouCache"