Merge change Idc447b41 into eclair

* changes:
  UI to manage/create custom Layout Devices.