Merge "Fix extra password confirm prompts during managed setup." into sc-dev