Merge proposals dependent on lp:~3v1n0/unity/launcher-controller-tests-fix

lp:~3v1n0/unity/launcher-controller-tests-fix has no merge proposals.