I got that worked-around (not resolved but also not still happening) by switching off graphics card energy saving (switching between external to onboard graphics).

Only rebooted after sleep if I was using a display through a thunderbolt dock and had graphics switching enabled.