Merge "Require a min height for the action chip text fields" into main