Revert "Revert "Backport MediaBrowser and MediaBrowserService""

This reverts commit 3371878d9135e013241907160d18aa3d08db09ce.
8 files changed