Is there any chance Bryce or anyone could review LP #681915 when there's time? It's assigned, in part, as a critical unity bug but I believe it can be closed with a cherry picked patch from upstream mesa, commit 32218e. After testing I've proposed a launchpad merge for it. If it needs more work and I can help please let me know. Thanks.