Re-apply fix from 0c23e43e21d8f62e432892822efe3069757a4731
Fix resize / move related crashes when editing during a scene change