Merge "Take into account the texture layer's transform for clipping Bug #7370212" into jb-mr1-dev