Merge "Unify wrapper-type drawables"