Merge proposals dependent on lp://qastaging/~davidgomes/unity/fix-for--823353

lp://qastaging/~davidgomes/unity/fix-for--823353 has no merge proposals.