Merge "configs: Support 2 instances of "primary input""