Game/Maps: Clean up instance zone-in handling (cherry picked from commit eb3dc8a4f0)
eb3dc8a4f0
hotfixes