Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev am: cf893ac40c
am: d4c4d946ae

Change-Id: I064ead2161ed1c1a0b91141fdf828eb6c9d7ce1d