Merge "Add support for specifying Drawable color filter in XML"