Merge proposals dependent on lp://qastaging/~ted/pidgin/12_sounds_and_timers.patch

lp://qastaging/~ted/pidgin/12_sounds_and_timers.patch has no merge proposals.