Issue #3622303: Fix default style creeping into available options when not explicitly selected

Devendra Mishrarequested to merge
issue/insert-3622303:3622303-style-selected-as into 3.x

Closes #3622303

Merge request reports