Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev