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: f5b5b790 am: 0a1bf27c

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

Change-Id: I4b7af20331f1e8098cef6b31e195aec92688c03b