Merge "Add factory reset wizard test coverage to factory reset preference controller" into main