Merge "Create separate source of truth for display info" into udc-dev