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

Change-Id: I4c97a57d7e3a6b6269f2197997d414eae1fcd9f7
Merge "Fixed logic for Default Sort on Grid by referencing the correct columns from the config to be sorted" into R2.0