Merge "Use max of content width and initial preferred width as the viewport."