Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev