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

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

Change-Id: Ic0c759754c56fbfc831e9555bc8812df6f85dd25