Ok none of this worked for me. Here is a possible solution that did work for me. Change your theme. I had a theme installed on my new S6 Edge Plus and it was the culprit. I changed it to another theme and Voila the screen finally went black after connecting the charging cable.
Hope this helps...