Merge proposals dependent on lp://qastaging/~didrocks/unity-lens-applications/optional-first-comment

1. optional-first-comment
2. Dependent merge proposals