Merge "Update factory reset dialog to new UX spec" into main