Merge: from duplicate_bot_id_fix - Bugfix for duplicate player id warning when loading a save - Bugfix for editor freezing when loading a save with a player Tests: playground with 1 transient, 1 persistent npc in editor then save -> load -> spawn player loop 3x