am 6d041a5d: am 0391096c: Merge "Launcher tweaks." into ics-factoryrom

* commit '6d041a5d90f6fb7c3d8bf35becfbd96ba685b728':
  Launcher tweaks.