Fix for device list refresh deadlock