Merge "Change page snapping logic for large screen devices" into tm-dev