Merge "Resolve call audio refactoring issues." into main