Merge "Prevent premature resetting of quickswitch mode" into ub-launcher3-rvc-dev