Merge proposals dependent on lp:~gerboland/unity-2d/launcher_shortcuts_fix

lp:~gerboland/unity-2d/launcher_shortcuts_fix has no merge proposals.