Merge "Fix StaggaredGridLayoutManager prefetch crash" into nyc-support-25.1-dev
am: 12d16cd984

Change-Id: I9294d10e191e07aab1573eddc457d7c5e91e655c