Merge "Use a strongly typed Pid in WindowInfo" into udc-qpr-dev