An even better solution for the Ctrl + Z bug that I've found - it only moves things around if you have actions to undo. If you get your character in a good place and save, then close the window entirely and re-open, there will be nothing in the undo stack, so as long as you don't accidentally shift any layers around, the undo actions will do nothing.
Still looking forward to this being fixed officially though!