Only first and last page of cross-page selection has to be updated.

Updated to new upstream packages where some our things have been merged
in.