Merge "Add car_secondary_icon_size and car_padding_0, and fix various existing values."