Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev