am bc3c3394: Merge change I8a2d2379 into eclair

Merge commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e' into eclair-mr2

* commit 'bc3c3394fb773346eff4b4a0b695ff00edcc821e':
  Add save/load for the user-made Layout Devices.