Merge "Defer deleteKey in KeyStorage in Checkpointing mode"