Merge "added scroll control support to WebView"