Merge pull request #12287 from bogdan/select-with-selected-option

Fix some edge cases for select with selected option
Conflicts:
	actionview/CHANGELOG.md