Merge "Show more detail failed info on waitForAllExitingWindows" into pi-dev