Merge "Fix various hw-accelerated line/point bugs"