Resolve "Cancelling a second comment edit doesn't return its state to before the edit"

Closes #42462

See merge request gitlab-org/gitlab-ce!16869