Merge proposals dependent on lp://qastaging/~paolorotolo/unity/fix-for-931382

lp://qastaging/~paolorotolo/unity/fix-for-931382 has no merge proposals.