Merge "Refactor VPN settings refresh to reuse preferences"