Merge "Properly sets the display id on Autofill UIs." into udc-dev