Correctly scan on cross-page selection.
Merge branch 'cross-page-scan' into peerlibrary