Merge "Re-enable failed test in FactoryResetPreferenceControllerTest" into main