Merge "Constrain scroll amount" into sc-v2-dev am: 348065811f am: 33120900b8

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

Change-Id: I58c2006e93d83fa6aa8917b159cef33736ed7507