Merge "Update UI for factory reset flow" into sc-dev