Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev