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

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