am af958dce: am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev

* commit 'af958dce341b0046808d544a040445bd2941f6a1':
  Pushing state persistence to a background thread