Merge "Add displayid to WindowInfos test wrapper" into udc-dev