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