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