Merge "Don't replace the singleton of DomainSelectionResolver"