Merge "Improve LayoutManager prefetch API"