Merge "Gate controls controllers with system feature flag" into rvc-dev