Merge "VPN: uncheck lockdown if always-on is off" into oc-dev