Fixed #21958: Handle dependencies for swappable models in AddField