Merge "Set the scale to be at least overview zoom scale."

            if (mWebView.getWebViewCore() != null) {

                // we always force, in case our height changed, in which case we

                // still want to send the notification over to webkit.

                refreshZoomScale(mUpdateTextWrap);

                setZoomScale(Math.max(mActualScale, getZoomOverviewScale()),

                    mUpdateTextWrap, true);

                // update the zoom buttons as the scale can be changed

                updateZoomPicker();

            }

                && Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1))) {

            mInitialZoomOverview = false;

            setZoomScale(zoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale));

        } else {

            mInZoomOverview = !exceedsMinScaleIncrement(mActualScale, zoomOverviewScale);

        }

    }