Merge "Disable output switcher in resumption controls" into rvc-dev