Merge "Revert "Fix build: Revert "Switching to the final PDF rendering library"""