Merge "Simplify support of prefetch with data set changed after layout" into nyc-support-25.1-dev