Terrain flickering update

I am still seeing terrain flickering when the HD graphics are enabled, the flickering disappears if I switch to SD graphics. This was introduced with the patch pulled over from the PTR that changed the graphics backend. This is what I mean:

https://i.imgur.com/y7hbnKU.png

The checkerboard pattern on the right side flickers constantly.

The last few patches have not fixed this issue yet. I am playing on an iMac with Win 10 installed via Bootcamp. I have also updated to the latest version of the Intel graphics drivers from the Intel website. My CPU is an Intel Core i5-4570R with Iris Pro 5200 graphics. And here are my display settings from DxDiag:

https://paste.debian.net/plain/1158521