Merge "Allow prefetching while data set changed after layout" into nyc-support-25.1-dev