Fixed batch groups staying unbatched for good when their rebuild got cancelled by another change in the same cell