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

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

Change-Id: I23a9c8fe3af4cd72772c9df271e9c9a2b16f47e4