Merge "Re-enable hardware acceleration. Driver bug seems fixed."