Merge proposals dependent on lp://qastaging/~azzar1/unity/fix-991637-6.0

lp://qastaging/~azzar1/unity/fix-991637-6.0 has no merge proposals.