Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev