Merge "MediaBrowser: Revert Search API" into oc-dev