Merge "Revert "New APIs for immersive audio"" into sc-v2-dev