Merge "Remove user switcher when multiple users is disabled"