Avoid cross-device moves when adding boxes