Merge "Turns off use of refactord UserSwitcherController." into tm-qpr-dev