Fixed logic for Default Sort on Grid by referencing the correct columns from the config to be sorted

Change-Id: Ie22494511f9a76e29df204bf2a3712a228496010
Merge "Fixed logic for Default Sort on Grid by referencing the correct columns from the config to be sorted"