Unity

Merge proposals dependent on lp://qastaging/~gordallott/unity/fix-focus-issues-on-click

  1. fix-focus-issues-on-click
  2. Dependent merge proposals

lp://qastaging/~gordallott/unity/fix-focus-issues-on-click has no merge proposals.