Merge "Fix text rendering artifact."