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

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