Merge "Update User switcher to new spec, implement adding users" into lmp-dev