Merge "Remove multiple calls to removeAudioDeviceCallback()"