Preserve numeric sort roles as well
This fixes sorting when the source model is set after the sort role using a numeric sort role rather than a sort role name.
(cherry picked from commit 43d33f06)
This fixes sorting when the source model is set after the sort role using a numeric sort role rather than a sort role name.
(cherry picked from commit 43d33f06)