Merge branch '26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold' into 'master'

Resolve "Diff unfold link is still visible when there are no lines to unfold"

Closes #26824 and #28127

See merge request !8761