Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master'

Resolve "Tag editor loses all inputs when you try to add a tag that already exists"

Closes #31625

See merge request !11155