Merge "Waiting for the setup wizard to go away" into main