Bug 945376: correctly handle the None alert tone setting
(cherry picked from commit 19dba5709ee860750765636f298889bf1441d083)
Merge pull request #14475 from davidflanagan/bug945376-v1.2

Bug 945376: correctly handle the None alert tone setting