Merge "Update edit_event proto" into main