Merge "WebView: switch to OMR1 FactoryProvider" into oc-mr1-dev