Merge "Put VPN settings under primary profile control" into lmp-dev