Merge "Calling pageTransisionEnd only after edgeEffect finishes" into sc-dev am: 44e6fb6ed4

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

Change-Id: I49b3735eb38f2e571a51ab5956cea94eb58200c8