Merge "Fix compose shader child local matrix mutation" into oc-dev