Merge "Handle PDFium API change" into pi-dev