formatting
Update code for upcoming 3.7 changes. Re-enables new flexible annotation toolbar after an upcoming internal PSPDFKit fix.