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