Merge "Update color-check-baseline.xml"