Merge "Don't run the WebView preparation if using the same non-replaced package" into nyc-dev