Merge "Revert "Use new not-deprecated builder constructors for AppTarget"" into ub-launcher3-master