[CP Staging] Revert "fix: use the same sort order for header display names and avatars in a group chat view"

(cherry picked from commit 9d4e3bd76aa80af7c939078c01cbcbf30064ada1)