Merge "MediaRouter: MediaRouteChooserDialog layout" into mnc-ub-dev