Merge "TAPL: Little cleanup" into ub-launcher3-qt-dev am: 331a11e0ed
am: 1eba6cbf49

Change-Id: I0630d2374c2a49d626db5c4d23628b5574e5ae50