Merge "Switch user on clicking on a user in User Settings" into lmp-dev