Merge "Make prefetch calls trigger isComputingLayout()=true" into nyc-support-25.4-dev