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

Change-Id: I15275b93ea2f38de6cc51920cf2b83db489e505a