Merge "config: Remove 2 instance support for "primary input""