Merge "[waitForAllWindowsDrawn] Wait for transition only with INVALID_DISPLAY" into main