Merge "Modify implementation around SetupWizard XL"