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

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