Merge "Persist incomplete pkg restore data for longer" into main