cherry-pick the video streaming patch