Merge "Fix check for whether a trace tag is enabled" into main