Merge proposals dependent on lp://qastaging/~tiagosh/unity-2d/fix-dash-highlights

lp://qastaging/~tiagosh/unity-2d/fix-dash-highlights has no merge proposals.