Merge "Fix a WebView scrolling regression - bug 2633572." into froyo