Merge "User switcher - Update when multiple users enabled/disabled" into tm-dev