Merge "Apply ComposeShader's local matrix to children" into jb-mr2-dev