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

                    mSettings.getUseWideViewPort()) {

                    // Use website's initial preferred width as the fixed viewport width.

                    mViewportWidth = Math.min(mSettings.getMaxFixedViewportWidth(),

                        draw.mMinPrefWidth);

                        Math.max(draw.mWidthHeight.x, draw.mMinPrefWidth));

                    draw.mViewState.mViewportWidth = mViewportWidth;

                }

                mInitialViewState = null;