Merge "MediaRouter: Set dialog window width that includes padding" into mnc-ub-dev