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