Merge "Supporting windows updated per display [Part II]"