Merge "work around webview scale bug"