Merge "Fix StaggaredGridLayoutManagerCacheTest to avoid older versions" into nyc-mr1-dev