Unity 8

Merge proposals dependent on lp://qastaging/~mzanetti/unity8/fix-usage-mode-switch

  1. fix-usage-mode-switch
  2. Dependent merge proposals

lp://qastaging/~mzanetti/unity8/fix-usage-mode-switch has no merge proposals.