Merge "Deal with print-preview renderings that do not match the correct number of pages." into nyc-dev