Fix ui-button failures
Merge pull request #1280 from gijsk/patch-1

Bug 935556 - Fix regression in ui-button tests r=@gozala