Merge proposals dependent on lp://staging/~saviq/unity8/fix-edges-demo

lp://staging/~saviq/unity8/fix-edges-demo has no merge proposals.