Replace ugly Drawer setting (Sort Mode)

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