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