Bug 836135. Avoid PLAYTONE response when dialog is showed
Revert "Merge pull request #7841 from crdlc/bug-835710"
Merge pull request #7898 from crdlc/bug-835710-revert2

Revert "Merge pull request #7841 from crdlc/bug-835710"
Merge pull request #7940 from frsela/STK/Bug836135_b

Bug 836135 - STK PLAY_TONE does not process any button presses, r=vingtetun
Merge remote-tracking branch 'upstream/master'