Merge "Clear unexpected buffer handle of sideband layer" into main