Merge "VPN profile: break up lockdown mode validation"