Merge "Make the StaggeredGridLayoutManagerSnappingTest more stable." into nyc-mr1-dev