Merge "Restart Bypassable VPNs when changing lockdown mode state"