NXDRIVE-46: Refactor move resolution without watchdog