Enable TopicIdTracker to support multiple flows
#9316
Merged
TopicIdTracker to support multiple flows
#9316