Merge "Fix up issues in PdfRenderer found by test."