Merge "Fix for scaled AA lines"