Fix date field button regression (#14572)

Regression was caused by patch https://dev.vaadin.com/review/#/c/4480

Fixed the same issue for ComboBox as well.

Change-Id: Id43912f0803b5e056d4ca6585746e53226282d85