Merge "Add Display ID when Getting Display State" into udc-dev