Merge "MediaBrowserCompat: Fix NPE" into nyc-dev