Merge "[Bouncer] Update userswitcher upon reset" into tm-dev