Merge "Use alternative way to fix split select page snapping issue" into sc-v2-dev