Merge "Fix up user switch flow a little."