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

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

Change-Id: I7b724745fac5f80b000dbbcab98afe83fefedc4d