Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev