Merge "Preserve TextView mDrawables if it has metadata (ex. tint or padding)"