Merge proposals dependent on lp://staging/~markjtully/unity-lens-shopping/alternate-shopping-lens

1. alternate-shopping-lens
2. Dependent merge proposals