Unity

Merge proposals dependent on lp://qastaging/~smspillaz/unity/unity.fix_na_tray_expo

  1. unity.fix_na_tray_expo
  2. Dependent merge proposals

lp://qastaging/~smspillaz/unity/unity.fix_na_tray_expo has no merge proposals.