Merge "CallAudioManager refactoring"