am 595b5bdf: am 603ce559: Merge "Apply ComposeShader\'s local matrix to children" into jb-mr2-dev

* commit '595b5bdf08ab315898b4af0c5c7033a912e004f7':
  Apply ComposeShader's local matrix to children