Merge "Add a intent creator token for the activity interceptors" into main