Merge "Clear native shader when Paint shader changes" into oc-dev