Merge pull request #15872 from gabrielesvelto/bug-960507

Bug 960507 - Properly remove the onheld event handler when doing a second call r=etienne
(cherry picked from commit 905a2aa679f6d2ed075d9414ed8f6b35f22153ee)