Merge "Apply/reset split scroll offset regardless of previous state" into sc-v2-dev am: 87f010f3bd am: 8c427dd750

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

Change-Id: Ia04b10a8fc9e55ca46bb80bdacd38b458b84b2e8