Merge "Split getSurroundSound method in 2 methods." into sc-dev