Merge proposals dependent on lp://qastaging/~davidc3/onehundredscopes/unity-lens-wikipedia-cards

1. unity-lens-wikipedia-cards
2. Dependent merge proposals