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: I514c3fda36c8d8b624c44a4054ad295e744ce1b1