Merge "MediaBrowser2: Implement search()/getSearchResult()"