More saving and restoring state upon an orientation change.