Merge "Fix DomainVerificationEnforcer for app visibility" into sc-dev