Merge "[Bouncer] refine entry for bouncer user switcher." into tm-qpr-dev