Merge "UserDataPreparer: be more careful about auto-deleting data on error" into main