Merge "MediaBrowserCompat: Make notifyChildrenChanged work" into nyc-dev