Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes"