Merge "Sets Drawable in DrawableWrapper properly"