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: I7cd9cb314e1880d954d4e339a09c37b9dd88a371