Merge "Fix line drawing path to use proportional distance from center" into jb-mr1-dev