Fixed an issue with floating boxes and page breaks

Fixed an issue in which floating boxes that were told to avoid page breaks inside were not avoiding page breaks when they directly followed another floating element.

It looked like there was some code that was trying to deal with re-laying out floating boxes that had been forced to move, and another piece that was trying to revert page breaks in the case that the block was told to avoid page breaks inside but was too long to fit on a single page. The two pieces of code were interfering with each other, and causing the bug.