am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)

Merge commit 'af496633406c19192db960d822b51fa1f574fbf2' into eclair

* commit 'af496633406c19192db960d822b51fa1f574fbf2':
  Add save/load for the user-made Layout Devices. (do not merge)