Merge "Move ActivityControlHelper impl to upper level" into ub-launcher3-master