Fix hover button not showing occasionally...

...due to the button state not being updated in certain circumstances
after the statusbar is recreated.

This is a cleanup of the commit that introduced hover.

Change-Id: I8f6a335bb0515e5b95d30e17744a5be2bb98c622