Merge "MediaBrowserService: Fix ConcurrentModificationException"