Merge "Prevent premature resetting of quickswitch mode" into rvc-dev am: 1c90b51de6 am: 995cab35af am: 3d040cfadd

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

Change-Id: I97835dad19d4decee4031f1697dd05240dde3c53