Fix sorting of container list (see #10242)
Fix sorting for screen
Merge pull request #661 from jburel/rebased/develop/list-sorting

Fix sorting of container list (see #10242) (rebased onto develop)