Merge "Simplify code that adds None as a valid timer ringtone" into ub-deskclock-charm