FIRE-4297: Fix for "Sort contact lists by username even when display names are shown" not working if display names are disabled
FIRE-4297: Fix for "Sort contact lists by username even when display names are shown" not working if display names are disabled

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm