Merge "Allow multi-window multiple device streams" into main