Merge branch 'sort-within-labels' into 'master'

Preserve label filters when sorting

## What does this MR do?

Allows Issues that are already filtered by labels to be sorted without losing the label filters.

## Why was this MR needed?

Users don't expect to lose their label filters when sorting Issues.

## What are the relevant issue numbers?

Closes #20982

See merge request !6136