Merge "Fix addAudioDeviceCallback() memory leak bug"