[xulrunner] Refresh patch with workaround for 977015