Merge "Fix spinning TaskPersister" into oc-dev