Merge proposals dependent on lp://staging/~gary-lasker/software-center/previous-purchase-sorting-lp873104

1. previous-purchase-sorting-lp873104
2. Dependent merge proposals