Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev