Merge "Defensively copy callback collections before invoking" into sc-dev