Merge "MediaBrowser2: Implement getItem/getChildren"