Merge "Restrict proxies for displays owned by the caller" into udc-dev