Merge "Fix user switching."