Merge "Add IconContainerRefactor tracing to flow collects" into main