Apollo: Add option for sorting by filename into 'Sort by' menu

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