Merge "Renaming isAttemptingFactoryReset to new name" into main