Merge "Fix getComponentName for DomainVerificationProxy" into sc-dev