Merge "Fix padding for GradientDrawable" into lmp-preview-dev