am 951df81d: Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev

* commit '951df81d02a9ed21c9e3cb0e81b0ebf9b08a527c':
  Add optimizations to keep TaskPersister queue small.