builder: fix long stream sync Upstream-commit: 2c1043c913b3d2313e5558825f3dc8fc1727042b Component: engine