Merge "Add tests for edge view to the LinearLayoutManagerSnappingTest" into nyc-mr1-dev