Merge branch 'disable-pdf-viewer' into features/ui-ux-improvements