Merge "Avoid marking ephemeral users for removal if they haven't been logged in yet." into main