Merge "Update persistent WebView packages setting only when user changes it." into nyc-dev