It should only be done for DEVICE_BUSY/IN_EXECUTION

(cherry picked from commit 0956fd46)
Fixes ticket #5924.