Merge proposals dependent on lp://qastaging/~marcobiscaro2112/unity/fixes-660010

lp://qastaging/~marcobiscaro2112/unity/fixes-660010 has no merge proposals.