Merge "Add null check to TaskPersister file list." into lmp-dev