Merge "Remove the per display window handles when the display is removed." into sc-dev