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

Change-Id: I7a366f4f159d340f66bdb165b57b923290857bc9