Merge "Separate interface and implementation of 2 more WebView classes"