Merge "Fix category names for perfetto api" into main