Merge "Include security level in per-operation watchdogs" into main