Merge "Pass non-nullable event by reference instead of pointer"