Merge proposals dependent on lp://qastaging/~jesse-imaginaryrobots/unity-lens-shopping/unity-lens-shopping-noglobal

1. unity-lens-shopping-noglobal
2. Dependent merge proposals