Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev