Unity

Merge proposals dependent on lp://qastaging/~didrocks/unity/misc-launcher-fixes-070411

  1. misc-launcher-fixes-070411
  2. Dependent merge proposals

lp://qastaging/~didrocks/unity/misc-launcher-fixes-070411 has no merge proposals.