Fixed some potential threading issues in DevicePicker