Merge "Add webview tracing bit"