Apply custom webview changes to OSX branch