typo
fix device type handling

device type is now set from the following sources, by decreasing
priority:
- server request
- model type
- automatic identification

This revert commit 952d763