Merge "Revert "Overlay new bluetooth settings into SetupWizard.""