Merge "Intercept activity start requests in client organizer" into sc-v2-dev