Merge "SecurityController: track VPN for all users"