Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
am: 0f9f0f90e7

Change-Id: I9ed9b1d27c28aef19553721266cb531ac410c175