am e7d32b19: Merge "Take text scale/skew into account only when rendering into...
am e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev
* commit 'e7d32b19':
Take text scale/skew into account only when rendering into a layer