Merge proposals dependent on lp://staging/~anthonywong/unity-launcher-folders/fix-packaging

lp://staging/~anthonywong/unity-launcher-folders/fix-packaging has no merge proposals.