Remove stateContext and originalEvent

Closes #3504960

Merge request reports

Loading