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

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