Avoid cross-device moves when adding boxes [GH-1350]