Merge "Support surrogate pairs when layouting text"