Merge "Do not remove active stream when stream configs changed" into main