15 R3, display issues, #2

I have an annoying issue with my Alienware 15 R3, whenever I need to restart or shutdown my laptop I get a screen that flickers after the Alienware logo. It's so bad now that I don't restart or shutdown my laptop. I did reinstall both Intel and Nvdia drivers and also reinstalled windows 10. One work around that seems to help is if I use the power button to put it in sleep mode and then push it again to wake it up. That clears the flickering every time. When I connect an external display that display shows no flickering. Running in safe mode works fine no flickering at all. I suspect it may have to do with the Intel 530 graphics and Nvidia 1060 not playing nice.