Pass more context

Stewart Martin-Haughrequested to merge
smh/athena:TRT_ctx2 into 23.0

Missed from !62865 (merged), avoid a currentContext call.

Merge request reports