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