Set device_diff for queued work or there will be no diff1 share count.
Merge branch 'master' into avalon-dev