Merge change I8a2d2379 into eclair

* changes:
  Add save/load for the user-made Layout Devices.