Merge "Fix Gizmo crash in OOM"