Merge "Fix prerestore snapshots incorrectly taken with checkpointing enabled." into rvc-dev