Merge "Add a flag that prevents resuming previous user after guest logout"