Merge proposals dependent on lp://staging/~brandontschaefer/unity/lp.1223630-fix

lp://staging/~brandontschaefer/unity/lp.1223630-fix has no merge proposals.