Merge "MediaBrowserCompat: Unregister callbacks when disconnect" into mnc-ub-dev