[xulrunner] Extend 20684 fix to handle partial hiding of toolbar