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

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

Change-Id: I3b06d7b5be3b40bd8ce3a7e8b6e9cc7305cc5a91