Unity

Merge proposals dependent on lp://qastaging/~mhr3/unity/fix-missing-category-icons

  1. fix-missing-category-icons
  2. Dependent merge proposals

lp://qastaging/~mhr3/unity/fix-missing-category-icons has no merge proposals.