Further calculator state cleanups

Bug: 33265653

Preserve evaluation results in history earlier.

Make the mapping from saved state to evaluation state much more
explicit. Note that we no longer map EVALUATE to INIT. It seems
to make sense to do the animation the first time, even if a
rotation intervened.

Change-Id: I8dcf41d62305debb06f3fe3eece9818b21b67bcc