Bug 958470 - [Ringtones] set ringer type to the ringtones player
Merge pull request #17231 from dominickuo/v1.3-bug-958470-new

Bug 958470 - [Ringtones] set ringer type to the ringtones player, r=jimporter
Merge pull request #17129 from etiennesegonzac/bug-981468-callgroup-keypad

Bug 981468 - Fixing JS erros occuring while using the keypad during a conference call. r=ferjm