Merge "Fix dst crop used in color converter"