[Bug 46996] Improvements to the 7.1 and 5.1 to stereo conversion