[release-20.0] Fix to prevent stopping buffering prematurely (#17013)#17204

Merged

GuptaManan100 merged 2 commits intorelease-20.0from backport-17013-to-release-20.0

Nov 11, 2024

+490-23

Commits on Nov 11, 2024