Merge "Skip assistant fallback set-up when it's disabled" into rvc-qpr-dev