Merge changes from topic "lockdownvpnmainuser"

* changes:
  Make lockdown VPN work for the main user.
  Add UserManagerInternal method to get the main user id.