Merge "Add a config resource for controls package" into rvc-dev