Bug 945376: correctly handle the None alert tone setting
Merge pull request #14473 from davidflanagan/bug945376

Bug 945376: correctly handle the None alert tone setting r=pdahiya