Merge "bridging: Add better support for adding/removing streams."