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

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

Change-Id: I029a1cd4de235892919370353f9190a2275f88c0