Merge "User switcher - Create user dialog fixes" into tm-dev