Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
am: e871596f15

Change-Id: I9813e607ebaec363fe6cd1c7b389b8c4ce2d5e74