Merge "Resolve call audio refactor test failures" into main