Fix Context ids

Fix for problems with context ids not populating in auto-generated events for start/end/interrupt/resume contexts.