Merge "Add getMediaItem API to MediaBrowser"