Merge "Correctly restarting Launcher from OOP tests" into ub-launcher3-qt-r1-dev
am: 7e15a184f5

Change-Id: Iba458b7b42f788ab92437d0644f31b116b865907