Merge "MediaBrowserServiceCompat: Fix ConcurrentModificationException"