Removed TODO item
Fixed threading issue in DevicePicker
Fixed some issues with bringing devices out of device store