Merge "Refactor setup wizard-related code"