Merge "Not precalculating launcher package in Tapl" into ub-launcher3-master