Merge "re-enable HW acceleration in DRT"