Fix: A diff comment on a change at last line of a file shows as two comments in discussion

Closes #32353

See merge request !11802