Merge "Invoke organizer events when a display is added / removed." into sc-dev