Merge "Move more code from WebViewUpdateService to separate overridable class" into nyc-dev