Merge "Introduce display specific all window drawn waiting (3/N)"