Merge "Update User-Agent test to match new WebView." into klp-dev