Merge "[Bouncer] fix user switch race condition" into tm-dev