Trebuchet : Persist sorting mode

Change-Id: I62e0e79785e7e4c56b8e31df78909c4522e229c7
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0