Merge "Allow checking if an activity is organized" into sc-v2-dev