Merge "Add a displayColor column to view_events"