Merge "Fix calling forceVolumeControlStream when Volume Dialog hides" into main