Merge "Implement proper stream selection in UI and stopStreaming"
am: 63e4980bc2

Change-Id: I35c8e1a3033540b0d90aa9f8479c0cd32888b0b9