am ec96305e: am 559167f3: Merge "Volume Overlay Bug When swapping streams"

* commit 'ec96305ea05355d57fd803edd57d6af1c4a9f83e':
  Volume Overlay Bug When swapping streams