Merge "Fix MediaBrowser.getItem() API inconsistencies." into mnc-dev