Merge "Revert "overlay: Update webview providers"" into q10