Better fix for device list refresh deadlocks