Merge "Revert "Fix NPE which occurs when MediaBrowserService.onLoadItem gives null"" into nyc-support-25.3-dev