Merge "Add support to trace bitmap count/bytes when enabled" into main