Merge "Check isUserUnlocked before attemp to delete snapshot file." into main