Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev