Merge "Enable anti-aliasing for hw-accelerated lines"