I see now what is happening.  I think I had the wrong mental model of how this
works.  I thought that a layout consisted of two components: normal mode
layout and debug mode layout.  My assumption was that when I saved a layout,
it recorded both the layout in normal mode and the layout in debug mode into
one file.  This doesn't seem to be the way it is implemented.  I don't really
think there is a bug here, but it still doesn't correspond to the way I
think about it.  Perhaps this can't be easily implemented (and maybe it isn't
even desirable) but I would like you to consider whether saving the "layout"
should save the current state of both normal and debug mode layouts and
restore would restore them both.

In any case, I'm closing this report.