Merge "Update the card preference buttons margin" into udc-dev