Merge "Set default for controls as enabled." into rvc-dev