Merge pull request #24224 from colemanw/fixSelect2AndNgOptions