Merge "Fixing crash in surround sound settings which occurs due to API getSurroundSound." into sc-dev