Merge "Add a flag for WebViewUpdateServiceImpl changes" into main