Upstream merge: Chicken jockey despawning and generation fixes