Merge "Add Secure Setting for Controls" into rvc-dev