Merge "Trebuchet Settings UI Refresh" into cm-11.0
Revert "Trebuchet: add lockscreen wallpaper picker"

This reverts commit 29c2da02bf48fbdba977bc774027e218487e1abe.

Change-Id: Ie5addf5ac77acb6411a6f22195d8608df625462a
Trebuchet: Remove duplicate string

Change-Id: I5a1ed314ca05eb4771038c0e08c4695ed51b3f92
Trebuchet: Update default_workspace

  - Gmail has changed its className for its android.intent.category.LAUNCHER
    intent.

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