Merge "Fix text rendering issue."