Merge "Two panel & two page swipe & currentPage fixes" into sc-dev am: 1e024358ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13728185

Change-Id: I60d81c9d7dfb540a6da40264bb3713618e2331fd