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

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