Merge "MediaBrowserCompat: Handle ServiceConnection methods in the given thread" into mnc-ub-dev