When OCR is disabled: Fix scan and page editing

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Merge branch 'unstable' into wip-remake-scan-process