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

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

Change-Id: Ic3add6c4a5e4530428e43e87b1cb1d7baeb6fd60