Merge "Fix compose shader child local matrix mutation" into oc-dev am: 611fae13df
am: 88677af970

Change-Id: I68729ff5415f329feeabb160c0308ecbe3d8fb3f