Merge "Prevent premature resetting of quickswitch mode" into ub-launcher3-rvc-dev am: 359a28e9

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

Change-Id: I0c139e6381b85d723997d6cf6135e12b7d64ff9f