Merge proposals dependent on lp://qastaging/~mhr3/unity-lens-applications/ascii-fold-app-data

1. ascii-fold-app-data
2. Dependent merge proposals