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

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