Merge "MediaBrowserCompat: Removing the black magic" into mnc-ub-dev