Merge "Check VPN status when adding/removing restricted profiles" into nyc-dev