Merge "Two panel & two page swipe & currentPage fixes" into sc-dev