Bug 999605 - Fix intermittent error in HardwareButtons tests
Merge pull request #22704 from timdream/hardwarebuttons-testfix

Bug 999605 - Fix intermittent error in HardwareButtons tests, r=kgrandon