Add changes from dBsooner:
combine messaging tone functionality patches that were previously split up into one.
Updated message-tone-sounds-and-alerts patch to just include alert and notification tone.