Merge "Don't show add user for simple user switcher" into lmp-dev