Unity

Merge proposals dependent on lp://qastaging/~didrocks/unity/desktop_label_fixes

  1. desktop_label_fixes
  2. Dependent merge proposals

lp://qastaging/~didrocks/unity/desktop_label_fixes has no merge proposals.