Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev