Merge proposals dependent on lp://qastaging/~alecu/unity-lens-music/revert-1168674

lp://qastaging/~alecu/unity-lens-music/revert-1168674 has no merge proposals.