Merge "bridge_softmix: Use removed stream spots when renegotiating."