Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev