Just upgraded to an S6 Edge+ and having the exact same problem.
I've noticed this detail: when I select the notification ringtone that I want and press back to return to the previous settings page, the following message appears briefly at the bottom of my screen:
Assuming the message is...