Merge "Properly release the sideband stream when setting a buffer" into main