Merge proposals dependent on lp://qastaging/~bilalakhtar/unity-lens-applications/fix-child-process-reaping-lp-1020115

1. fix-child-process-reaping-lp-1020115
2. Dependent merge proposals