am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.

Merge commit '54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken

* commit '54c5330f23adc0f9928936f44b2d20d327d900c8':
  Save/restore the picture in a background thread.