Merge "Turns on refactored UserSwitcherController." into tm-qpr-dev