Merge proposals dependent on lp://qastaging/~toineo/unity/fix-ws-icon

lp://qastaging/~toineo/unity/fix-ws-icon has no merge proposals.