Merge "Always put current user first in user switchers" into lmp-dev