Merge "Updated DrawableWrapper implementation to support the hidden setXfermode method to delete the corresponding Xfermode to the wrapped drawable"