Merge "Fixing issue where certain icons in the customization drawer were not being scaled down to size."