Merge "Moving some utility methods around" into ub-launcher3-master