Bug 999605 - Fix intermittent error in HardwareButtons tests +shepherd