Merge "Adding a TODO to productize killing/dismissal of setup wizard" into main