Merge "Two WebView API cleanups"