TIMOB-11487: Only reset padding for when backgroundColor/image is set. (prevents TIMOB-9055 also)
Merge pull request #3737 from ayeung/timob-12336

TIMOB-11487: Only reset padding for when backgroundColor/image is set. (...