Merge "Converting more tests to TAPL" into ub-launcher3-qt-dev am: a730a233b8
am: c3caa394d1

Change-Id: I6bb40cd4bb0e3553bb1b60726c8b94d96098769e