Merge "Volume Overlay Bug When swapping streams"