Merge "Fixing a bug that when an app is dismissed or loaded that changes the...

Merge "Fixing a bug that when an app is dismissed or loaded that changes the current active audio stream, if the volume overlay is visible during the swap, if you adjust the volume (with hard keys) after the steam has changed while the panel is still visible, the wrong panel (view) is still visible on-top of the one that is being adjusted." into ics