Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main