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

Change-Id: If78828e394ca25479dee08da72a658ad3b66f371