Merge "Remove unused MediaBrowser2 and relevant classes"