Merge "Add new API useful for determining text height for empty text field" into main