Merge "Distinguish the cursor height and line height." into new_text