Merge "Make setActiveConfig() private, remove plumbing"