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

Change-Id: I9db6eead1b7bb1d8d0df559bc29e048780c8fbd8