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

Merge "Prevent premature resetting of quickswitch mode" into rvc-dev am: 1c90b51d am: 995cab35 am: 3d040cfa am: 34f04fe1

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

Change-Id: Ic81575a194a8c86ea57b40752d1f3d3ba2ee0705