Merge "Update APIs for DomainSelectionService" into main