Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev