Merge "audio: Fix default surround sound config" into main