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

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

Change-Id: I0fdaead265b85eac1221add68a0d1ca8ed20331f