Merge "MediaRouter: Apply dialog width spec" into mnc-ub-dev