Merge "Add Tile4x2 support to color convertor"