am 79511838: (-s ours) am ec96305e: am 559167f3: Merge "Volume Overlay Bug When swapping streams"

* commit '79511838f94c38f92215173c18f3e17da61a8f5d':
  Volume Overlay Bug When swapping streams