Merge "More efficient text rendering on path"