Merge "Adding more activities for inproc tests" into ub-launcher3-qt-dev
am: c9a2eb0809

Change-Id: I06cad4c22382942bba68846f23e63cd34f720752