Merge "Revert making Color final" into oc-dev