Merge proposals dependent on lp://qastaging/~mhr3/unity/fix-961979

lp://qastaging/~mhr3/unity/fix-961979 has no merge proposals.