Merge "Separating out configs and common manifest entries" into ub-launcher3-calgary