Merge proposals dependent on lp://qastaging/~mhr3/unity-lens-files/fix-841847

lp://qastaging/~mhr3/unity-lens-files/fix-841847 has no merge proposals.