Merge "Add optimizations to keep TaskPersister queue small." into lmp-dev