Merge "Ensure zygote process is killed when webview provider changes" into main