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

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

Change-Id: I1fa2ee5011b0a3e7a8ce1445c4e40eb086d60f7b