Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev