Merge "Fix shift-selection."