Merge "Including wrapper code in Launcher builds" into ub-launcher3-master