Merge "[SetupWizard] Refactor WifiSetupActivity"