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

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