Merge pull request #7864 from frsela/STK/Bug836135

Bug 836135 - STK PLAY_TONE does not process any button presses, r=vingtetun
Merge pull request #7940 from frsela/STK/Bug836135_b

Bug 836135 - STK PLAY_TONE does not process any button presses, r=vingtetun