Merge "User switcher - Fix adding user as non-system user" into tm-dev