Merge "Align User Switcher with User Settings" into tm-qpr-dev