Resolve #3593870 "Sort order ruined"

Andrei Ivnitskiirequested to merge
issue/media_gallery-3593870:3593870-sort-order-ruined into 3.3.x

Related to #3593870

Merge request reports