Fix morenullrefs in workflow activity

[jakenuts]

Describe the change
Corrected additional null reference errors in Activity enrichment methods.

Describe your implementation or design
Using null collescing operator and null checks where necessary to ensure WorkflowStep properties and Activity.Current were not null before using them

Tests
No

Breaking change
No

Additional context
Missed these in my original submission