Merge "Take scale into account when greedily prefetching an entire layer" into ics-mr0