Merge "Track the empty desk correctly inside `applyLoadPlan`" into main