Merge "Only run domain verification filtering for valid Intents" into sc-dev