Merge "Revert "Invoke organizer events when a display is added / removed.""