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