Merge "Removing some unused code path" into ub-launcher3-master