Merge "Unhide invalidateColors API" into oc-mr1-dev