am dc869669: am 2be4fdbf: Preserve/restore calculator instance state

* commit 'dc869669713dfcc6369b8fe44817157c11afcca9':
  Preserve/restore calculator instance state