Merge "Require a min height for text field" into main