Merge "Update IntentResolver snapshots" into sc-dev