Fix ZEN-13347: merge per-metric tags with overall query-level tags.