Merge "Add horizontal dividers to UI per mocks" into udc-dev