MR #6291 needs to be reviewed, as it has the latest changes. I have updated t...

MR #6291 needs to be reviewed, as it has the latest changes. I have updated the MR, as earlier it was only targeting .form-element--type-select but this is happening on .form-element--type-select-multiple multiple select field as well. please review