Merge "Fix bug where the ID stored for an OnAudioFocusChangeListener is an empty string when audio focus is requested or abandonned with a null listener."