Merge "Implement proper stream selection in UI and stopStreaming"