Merge "Snap to destination page before animating folder close." into sc-dev am: 1536248f3d

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

Change-Id: Ifd418dfb534b09ff46a83e8a9f97ee7ba2021dc3