Merge "MediaRouter: Fix dialog width" into mnc-ub-dev