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

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