Merge "Fix MediaRouteActionProvider button sizing"