Trebuchet:
   Themes shortcut should take you to ThemeSettings preference fragment
   instead of ThemeChooser

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