Merge "Padding and color fixes to align with mocks" into udc-dev