Dereks patch was tested on 17.2.4 and 17.3.0-rc2 and solves the problem. EFL apps and weston-simple-egl work fine. Merge and close.