Issue #2369393 by eshta: Override hard-coded height for submit button sizes.
Merge branch 'Issue-2369393' into develop