Merge "Switch user only if the user is changed" into pi-dev