Merge pull request #15442 from artfulrobot/fix-select2-height-followup-from-15403