Merge "Fix bugs in optimized colorMatrix." into jb-mr1-dev