Merge "MediaBrowserUtils: Fix NPE"