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

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

Change-Id: Ib61704ae9fd492a7569e191059f3de0acc560073