Merge "Fix typos related to sortSelectionIndices"