Merge "Refactor `ConnectivityPacketTracker` for dependencies" into main