Merge "Fix default for CONTROLS_ENABLED" into rvc-dev