Merge "Don't run WebView-preparation during an encryption boot phase." into nyc-dev