Merge "Revert "Enable new S APIs for WebView.""