am 2be4fdbf: Preserve/restore calculator instance state

* commit '2be4fdbfcd5f16bc12066d1ccac181bca3dfaa7a':
  Preserve/restore calculator instance state