Merge "[User Switcher] remove add guest user..." into tm-qpr-dev