[Backport 2.x] [Discover] Decouple data$ updates to prevent rows clearing on hook re-render

[Backport 2.x] [Discover] Decouple data$ updates to prevent rows clearing on hook re-render #4327