Merge "SystemConfig: Allow runtime differentiation of vendor configurations" into rvc-dev