Merge "Editor: Account for a split cursor in the content rect calculation"