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

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

Change-Id: Iabeaef0f1da87df55708757e298e29c1c829bd8b