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

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