Merge "Rename paraneter device_name to device_type in single device dialog" into udc-dev