Merge "[waitForAllWindowsDrawn] Wait for default display transition when INVALID_DISPLAY is passed" into main