Merge "Revert "Prefetching can be interrupted by other service requests."" into sc-dev