Merge "Fix text redering issue where the text was sometimes truncated"