Merge "Add support for ColorFilters."