Merge "Revert "Include Launcher3QuickstepLib for tapl"" into ub-launcher3-master