Merge "[CD Cursor] Add DisplayTopologyValidator" into main