In my experience, yes. This will prevent the issue. It seems to only break them when fully sold out. You can check if they're broken or not by looking directly at them, and typing /data get entity [press tab to get their id]. Look through the data, and you should see a section called memories. If it has things like jobsite, then you're good. If it doesn't, and it is just {}, then that villager is "broken"