Merge "Revert "Topology listener API"" into main