Merge "Prevent premature resetting of quickswitch mode" into rvc-dev am: 1c90b51d am: 995cab35 am: f5b5b790

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

Change-Id: I51086bea65295af5b86874aa1eafa067536beaad