fix(api): send to closed channel in mergeLogStreams (#7006) (cherry-pick #21178)#21188

crenshaw-dev merged 1 commit intorelease-2.12argoproj/argo-cd:release-2.12from

cherry-pick-392780-release-2.12argoproj/argo-cd:cherry-pick-392780-release-2.12Copy head branch name to clipboard