Merge "Don't flash colors when hinting" into oc-dev