Merge "Fix incorrect hasPerDomainConfigs check"