Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev