Gapps: possible SetupWizard fix