Merge "Fix tabs abruptly reset during swipe" into sc-dev am: 530f644788 am: 88bb7ec522

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

Change-Id: I52f0c0c8f5460f4dca42ad3ae2f1489e5fdfe821